0000000000000000000000000000000000000000 2e11110d33d715c6261756261d3be2f360dc5af5 JimmehG <j.gronowski@gmail.com> 1454126206 +1100	clone: from https://github.com/JimmehG/newWizardTowers.git
2e11110d33d715c6261756261d3be2f360dc5af5 d1b9d21ebbe26dc758289de9d1a7bd11496fd562 JimmehG <j.gronowski@gmail.com> 1454126319 +1100	commit: Most important!
d1b9d21ebbe26dc758289de9d1a7bd11496fd562 78780e4dd31202c6424d961ec28b98e65d3e8903 JimmehG <j.gronowski@gmail.com> 1454127326 +1100	pull origin master: Fast-forward
78780e4dd31202c6424d961ec28b98e65d3e8903 7adee781b6ace5e99e362fbdf98d7e324f4b523c JimmehG <j.gronowski@gmail.com> 1454131664 +1100	commit: Added arrows and ability to change view to the other player
7adee781b6ace5e99e362fbdf98d7e324f4b523c b9b8e54b42319dd746afad7b3908085f0129d0d4 JimmehG <j.gronowski@gmail.com> 1454132179 +1100	rebase finished: refs/heads/master onto dfa44690dc4f5805949e3f775cbdcc2f0c16fe0c
b9b8e54b42319dd746afad7b3908085f0129d0d4 95b740c146db48f5bed55e046016857b9a0663a6 JimmehG <j.gronowski@gmail.com> 1454132731 +1100	pull origin master: Fast-forward
95b740c146db48f5bed55e046016857b9a0663a6 45122b3dc19e4776a05920b66f9739a058a481ae JimmehG <j.gronowski@gmail.com> 1454136500 +1100	commit: no message
45122b3dc19e4776a05920b66f9739a058a481ae d515b1a87b4a74ebd4bad63137beec183d1a9457 JimmehG <j.gronowski@gmail.com> 1454136678 +1100	commit (merge): Merge branch 'master' of https://github.com/JimmehG/newWizardTowers
d515b1a87b4a74ebd4bad63137beec183d1a9457 de32fd0e735a5c6c44e440812127ac67ac10a8f4 JimmehG <j.gronowski@gmail.com> 1454138214 +1100	pull origin master: Fast-forward
de32fd0e735a5c6c44e440812127ac67ac10a8f4 7758ade407d587aac2be7b4dfe69225f6823c5e5 JimmehG <j.gronowski@gmail.com> 1454142597 +1100	pull origin master: Fast-forward
7758ade407d587aac2be7b4dfe69225f6823c5e5 e9430b14e5e9d66b9754dc724ec0553148f1640b JimmehG <j.gronowski@gmail.com> 1454142647 +1100	commit: Added more UI. Started Rune placement.
e9430b14e5e9d66b9754dc724ec0553148f1640b df3f29e55160415de4bfa21b83a00d5f1552ab89 JimmehG <j.gronowski@gmail.com> 1454147882 +1100	pull origin master: Fast-forward
df3f29e55160415de4bfa21b83a00d5f1552ab89 c126b68bb18b6ead007e0dc231e4c4f87bbce907 JimmehG <j.gronowski@gmail.com> 1454147987 +1100	commit: UI canvas group for all ui to become transparent and uninteractable when on results phase.
c126b68bb18b6ead007e0dc231e4c4f87bbce907 c1dc76f54e2e2f9af3413eae633f2311d2409bae JimmehG <j.gronowski@gmail.com> 1454153532 +1100	pull origin master: Fast-forward
c1dc76f54e2e2f9af3413eae633f2311d2409bae 6797f955e00801ccf016fac230b1c3863a4c023a JimmehG <j.gronowski@gmail.com> 1454153620 +1100	commit: Prepared runes for buttons
6797f955e00801ccf016fac230b1c3863a4c023a 8ef9fa1b5cb83f841b32b4848f10d0cdee4c3bb0 JimmehG <j.gronowski@gmail.com> 1454155846 +1100	pull origin master: Fast-forward
8ef9fa1b5cb83f841b32b4848f10d0cdee4c3bb0 30953f67c89eabd255476a589b3729ffa5c64745 JimmehG <j.gronowski@gmail.com> 1454157665 +1100	pull origin master: Fast-forward
30953f67c89eabd255476a589b3729ffa5c64745 674b8add214603d61b7a16058d95f85250fad5f7 JimmehG <j.gronowski@gmail.com> 1454180029 +1100	pull origin master: Fast-forward
674b8add214603d61b7a16058d95f85250fad5f7 9a4b8014b593c113b9d5d26a0c19e53a48e2c2e9 JimmehG <j.gronowski@gmail.com> 1454188271 +1100	commit: Marcus here
9a4b8014b593c113b9d5d26a0c19e53a48e2c2e9 78da907301dd501e92107579e133b93b4c5bc3a5 JimmehG <j.gronowski@gmail.com> 1454190440 +1100	commit: Added light shield script so it can be destroyed after a certain time and collision
78da907301dd501e92107579e133b93b4c5bc3a5 216fde82f8e6615b796dea0adb378d9e3223e6fc JimmehG <j.gronowski@gmail.com> 1454198400 +1100	commit: target display when pressing ritual, ritual casting effect and animation beginnings
216fde82f8e6615b796dea0adb378d9e3223e6fc 5a74cd9fadde8642a04e0db42bdf9233da611442 JimmehG <j.gronowski@gmail.com> 1454198412 +1100	pull origin master: Merge made by the 'recursive' strategy.
5a74cd9fadde8642a04e0db42bdf9233da611442 6078b93bd9caceaa1c57547b8712446b340a9e50 JimmehG <j.gronowski@gmail.com> 1454198511 +1100	commit: Saved scene
6078b93bd9caceaa1c57547b8712446b340a9e50 0d612d45bdbe892ad2d96c2145c2d24bf041054d JimmehG <j.gronowski@gmail.com> 1454203767 +1100	commit: Target players. No autoconfuse.
0d612d45bdbe892ad2d96c2145c2d24bf041054d 7bafaf8dd26e6ed2e99f9389de5995f25e87d1d7 JimmehG <j.gronowski@gmail.com> 1454203778 +1100	pull origin master: Merge made by the 'recursive' strategy.
7bafaf8dd26e6ed2e99f9389de5995f25e87d1d7 8990e66e3378be32e23625aa67bb3ca3bf050c68 JimmehG <j.gronowski@gmail.com> 1454203921 +1100	commit (amend): Merge branch 'master' of https://github.com/JimmehG/newWizardTowers
8990e66e3378be32e23625aa67bb3ca3bf050c68 94d230bc723154fb1be15c21a9fc76353f0ea800 JimmehG <j.gronowski@gmail.com> 1454205362 +1100	commit: Main menu and background swap
94d230bc723154fb1be15c21a9fc76353f0ea800 aa862f3e2c0f541189c1371df83a28f82ecf20e6 JimmehG <j.gronowski@gmail.com> 1454213645 +1100	commit: sound, fireball, shield
aa862f3e2c0f541189c1371df83a28f82ecf20e6 ef53076a828d5667f4c3beeba2c3144b2e5e2da0 JimmehG <j.gronowski@gmail.com> 1454213654 +1100	pull origin master: Merge made by the 'recursive' strategy.
